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

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/TrayServiceImpl.java

@@ -56,8 +56,8 @@ public class TrayServiceImpl extends SuperServiceImpl<TrayMapper, Tray> implemen
     public Tray save(TraySaveDTO data) {
         Tray module = BeanPlusUtil.toBean(data, Tray.class);
         //根据编码规则
-        String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TRAY);
-        module.setNo(no);
+        //String no = codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TRAY);
+        //module.setNo(no);
         save(module);
 
         //新增夹紧位置