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

guoshilong

2023-06-21 b37bdc2060e6bd7bf8cb2b2d844fe45a549d210a

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java

@@ -66,6 +66,13 @@
   @ApiModelProperty(value = "注册登记码")
   @TableField("\"res_reg_code\"")
   private String resRegCode;

   /**
    * 注册登记码
    */
   @ApiModelProperty(value = "标签")
   @TableField("\"label\"")
   private String label;
//
//   /**
//    * 其他行业注册号