Merge branch 'dev-2.11.0' of depot-qinghai/depot-device-qinghai into dev

src/main/java/com/chinaitop/depot/device/controller/BusinessImPurchaseSaleController.java

@@ -48,11 +48,7 @@ public class BusinessImPurchaseSaleController {
     }
 
     @PostMapping("/saveAndUpdate")
-    //@RequestMapping(value="/saveAndUpdate",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
     @ApiOperation(value="采购销售管理-保存/修改", notes = "保存/修改")
- /*   @ApiImplicitParams({
-            @ApiImplicitParam(name="businessImPurchaseSaleJson", value="表数据", paramType="form")
-    })*/
     public Map<String, Object> save(@RequestBody String businessImPurchaseSaleJson) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象

src/main/java/com/chinaitop/depot/device/service/impl/BusinessImPurchaseSaleServiceImpl.java

@@ -33,7 +33,7 @@ import java.util.Map;
 public class BusinessImPurchaseSaleServiceImpl extends ServiceImpl<BusinessImPurchaseSaleMapper, BusinessImPurchaseSale> implements BusinessImPurchaseSaleService {
     private static Map<String, Integer> sequenceNumbers = new HashMap<>(); // 映射：仓房代码到顺序号
     private static final int MAX_SEQUENCE_NUMBER = 10000; // 顺序号的最大值
-    private static final String DATE_FORMAT = "yyyy";
+    private static final String DATE_FORMAT = "yyyyMMdd";
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT);