Browse Source

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

‘linchangsheng’ 5 tháng trước cách đây
mục cha
commit
801fb50803

+ 1 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -435,7 +435,7 @@ public class OrderBaseLogic {
 
 
         if ("安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
-                && (StringUtils.isBlank(one.getWorkerNumber()) || (!pgOrderBase.getWorkerId().equals(one.getWorkerId())))) {
+                && StringUtils.isBlank(one.getWorkerNumber())) {
             throw new RemoteServiceException("暂无权限接单");
         }
 

BIN
mall-server-api/src/main/resources/template/网点管理导入模板.xlsx