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

# Conflicts:
#	platform-rest/src/main/java/com/platform/rest/controller/sb/SbChangeRecordController.java

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -25,31 +25,30 @@ public class ExportSbInfoVO implements Serializable {
      */
     @Excel(name = "主键", orderNum = "1")
     private String id;
-
     /**
      * 设备编号
      */
-    @Excel(name = "设备编号", orderNum = "2")
+    @Excel(name = "设备编号(必填)", orderNum = "2")
     private String no;
     /**
-     * 设备编号
+     * 设备位号
      */
-    @Excel(name = "设备自编号", orderNum = "3")
-    private String zbh;
+    @Excel(name = "设备位号", orderNum = "3")
+    private String positionNo;
     /**
      * 设备名称
      */
-    @Excel(name = "设备名称", orderNum = "4")
+    @Excel(name = "设备名称(必填)", orderNum = "4")
     private String name;
     /**
      * 设备名称
      */
-    @Excel(name = "设备型号", orderNum = "5")
+    @Excel(name = "设备型号(必填)", orderNum = "5")
     private String model;
     /**
      * 设备等级
      */
-    @Excel(name = "设备等级(必填)", orderNum = "6", dicCode="SBINFO_LEVEL")
+    @Excel(name = "设备等级(必填, 1:A级，2:B级，3:C级)", orderNum = "6", dicCode="SBINFO_LEVEL")
     private Integer level;
     /**
      * 设备原值
@@ -64,13 +63,8 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 自定义类型
      */
-    @Excel(name = "自定义类型(必填)", orderNum = "9", dicCode="SB_USE_TYPE")
+    @Excel(name = "自定义类型(3:一般性设备,4：计量设备,5：特种设备)", orderNum = "9")
     private Integer useType;
-    /**
-     * 大小/尺寸
-     */
-    @Excel(name = "大小/尺寸", orderNum = "10")
-    private String zz;
     /**
      * 设备位置
      */
@@ -79,7 +73,7 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 使用位置
      */
-    @Excel(name = "系列号(出厂编号)", orderNum = "12")
+    @Excel(name = "出厂编号", orderNum = "12")
     private String zzh;
     /**
      * 生产商
@@ -104,24 +98,25 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 状态
      */
-    @Excel(name = "状态(必填)", orderNum = "17", dicCode="SB_INFO_STATUS")
+    @Excel(name = "状态(必填,1在库，2使用中)", orderNum = "17")
     private Integer status;
     /**
      * 备注
      */
     @Excel(name = "备注", orderNum = "18")
     private String remark;
-    /**
-     * 是否子设备
-     */
-    @Excel(name = "是否子设备(必填)", orderNum = "19", dicCode="SB_IS_CHILD")
-    private Integer isChild;
     /**
      * 财务编码/固定资产编号
      */
-    @Excel(name = "财务编码", orderNum = "20")
+    @Excel(name = "是否固定资产", orderNum = "20")
     private String financingNo;
 
+    /**
+     * 固定资产
+     */
+    @Excel(name = "是否固定资产(必填,0否,1是)", orderNum = "25")
+    private Integer isFinancing;
+
     /**
      * 上次检定日期
      */
@@ -131,7 +126,7 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 检定周期
      */
-    @Excel(name = "检定周期", orderNum = "22")
+    @Excel(name = "检定周期(月)", orderNum = "22")
     private Integer checkPeriod;
 
     /**
@@ -146,16 +141,10 @@ public class ExportSbInfoVO implements Serializable {
     @Excel(name = "预警天数", orderNum = "24")
     private Integer seatNumber;
 
-    /**
-     * 固定资产
-     */
-    @Excel(name = "固定资产(必填)", orderNum = "25", dicCode="SB_IS_FINANCING")
-    private Integer isFinancing;
-
     /**
      * 使用寿命
      */
-    @Excel(name = "使用寿命", orderNum = "26")
+    @Excel(name = "使用寿命(年)", orderNum = "26")
     private Double workYear;
 
     /**
@@ -167,7 +156,7 @@ public class ExportSbInfoVO implements Serializable {
     /**
      * 是否需要检定
      */
-    @Excel(name = "是否需要检定(必填)", orderNum = "28", dicCode="YES_NO")
+    @Excel(name = "是否需要检定(必填,0否,1是)", orderNum = "28")
     private Integer isMeasure;
 
 }

platform-rest/src/main/java/com/platform/rest/controller/sb/SbChangeRecordController.java

@@ -64,7 +64,7 @@ public class SbChangeRecordController {
    * @return R
    */
   @SysLog("新增设备更改记录表")
-  @PostMapping("/batch")
+  @PostMapping
   @PreAuthorize("@pms.hasPermission('sb-change-records-add')")
   public R saveBatch(@RequestBody BatchSbChange batchSbChange) {
     sbChangeRecordService.saveBatch(batchSbChange);