Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java

@@ -73,6 +73,7 @@ public class SmErpCgDdController {
     @PreAuthorize("@pms.hasPermission('supermarket_smErpCgDd_view')" )
     public R getSmErpCgDdPage(@ParameterObject Page page, @ParameterObject SmErpCgDdEntity smErpCgDd) {
         LambdaQueryWrapper<SmErpCgDdEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.orderByDesc(SmErpCgDdEntity::getCreateTime);
         return R.ok(smErpCgDdService.pageScope(page, wrapper));
     }
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java

@@ -80,6 +80,7 @@ public class SmErpCgPlanController {
 		wrapper.eq(Objects.nonNull(smErpCgPlan.getPlanDate()),SmErpCgPlanEntity::getPlanDate,smErpCgPlan.getPlanDate());
 		wrapper.eq(Objects.nonNull(smErpCgPlan.getHandlerUserId()),SmErpCgPlanEntity::getHandlerUserId,smErpCgPlan.getHandlerUserId());
 		wrapper.eq(StrUtil.isNotBlank(smErpCgPlan.getCheckStatus()),SmErpCgPlanEntity::getCheckStatus,smErpCgPlan.getCheckStatus());
+        wrapper.orderByDesc(SmErpCgPlanEntity::getCreateTime);
         return R.ok(smErpCgPlanService.pageScope(page, wrapper));
     }
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java

@@ -514,7 +514,7 @@ public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEnt
         Long deptId = SecurityUtils.getUser().getDeptId();
         R<MchManageVo> mchManageVoR = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
         if (null==mchManageVoR.getData()){
-            return R.failed("当前用户未绑定超市商户");
+            return R.failed("当前用户未绑定超市自营商户");
         }
         Long merchantId = mchManageVoR.getData().getId();
         //错误集合