修改处置资产，和部门建议列表

pcbms/src/main/java/com/hssx/pcbms/entity/GoodsNo.java

@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-11-18
+ * @since 2019-12-10
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,7 +34,7 @@ public class GoodsNo extends Model<GoodsNo> {
     private Integer id;
 
     /**
-     * 模具编号(对于机柜和机柜设备无用)
+     * 模具编号
      */
     @TableField("model_no")
     private String modelNo;
@@ -61,7 +61,6 @@ public class GoodsNo extends Model<GoodsNo> {
      * 创建日期
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -71,7 +70,7 @@ public class GoodsNo extends Model<GoodsNo> {
     private Integer goodsId;
 
     /**
-     * 用户表关联外键
+     * 用户表关联外键 0-其他
      */
     @TableField("user_id")
     private Integer userId;
@@ -80,7 +79,6 @@ public class GoodsNo extends Model<GoodsNo> {
      * 最后更新日期
      */
     @TableField("update_indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateIndate;
 
     /**
@@ -96,23 +94,29 @@ public class GoodsNo extends Model<GoodsNo> {
     private String goodSnNo;
 
     /**
-     * 标签ID
+     * 标签id
      */
     @TableField("label_id")
     private String labelId;
 
     /**
-     * 模块ID
+     * 模块id
      */
     @TableField("model_id")
     private String modelId;
 
     /**
-     * u位号
+     * U位数
      */
     @TableField("u_bit_num")
     private String uBitNum;
 
+    /**
+     * 初始U位号
+     */
+    @TableField("u_bit_num_initial")
+    private String uBitNumInitial;
+
     /**
      * 功率(W)
      */
@@ -120,13 +124,13 @@ public class GoodsNo extends Model<GoodsNo> {
     private Double power;
 
     /**
-     * 额定电流(A)
+     * 额定电流
      */
     @TableField("rated_current")
     private Double ratedCurrent;
 
     /**
-     * 额定电压(V)
+     * 额定电压
      */
     @TableField("rated_voltage")
     private Double ratedVoltage;
@@ -310,6 +314,12 @@ public class GoodsNo extends Model<GoodsNo> {
     @TableField("is_rack")
     private Integer isRack;
 
+    /**
+     * 分配时的备注
+     */
+    @TableField("note")
+    private String note;
+
 
     @Override
     protected Serializable pkVal() {

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("goods");
+        strategy.setInclude("goods_no");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);