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

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/CompanyCaAuthLogic.java

@@ -161,6 +161,9 @@ public class CompanyCaAuthLogic {
             c2.setLegalIdCard(c1.getLegalIdCard().trim());
             flag = true;
         }
+        if (!c1.getShortName().trim().equals(c2.getShortName().trim())) {
+            c2.setShortName(c1.getShortName().trim());
+        }
         return flag;
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/ChangeOrderLogic.java

@@ -216,7 +216,7 @@ public class ChangeOrderLogic {
                 .update();
 
         List<PgOrderBase> list = pgOrderBaseService.lambdaQuery()
-                .in(PgOrderBase::getId, ids).list();
+                .in(PgOrderBase::getId, orderIds).list();
 
         for (PgOrderBase pgOrderBase : list) {
             if (pgOrderBase.getIsImportExcel()) {