Merge remote-tracking branch 'origin/developer' into developer

gic-store-web/src/main/java/com/gic/store/web/controller/StoreDictController.java

@@ -122,7 +122,7 @@ public class StoreDictController {
         Integer enterpriseId = 1111;
         ServiceResponse serviceResponse = this.storeDictApiService.listStoreField(enterpriseId);
         if(serviceResponse.isSuccess()){
-            return RestResponse.success(serviceResponse.getResult());
+            return RestResponse.success(EntityUtil.changeEntityListByJSON(StoreDictVO.class, serviceResponse.getResult()));
         }
         return EnterpriseRestResponse.failure(serviceResponse);
     }