Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -117,4 +117,8 @@ public class GoodsBankAddBo {
     /** 服务期数值 */
     @ApiModelProperty("服务期数值")
     private Long serviceTimeNum;
+
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -145,4 +145,8 @@ public class GoodsBankEditBo {
     /** 服务期数值 */
     @ApiModelProperty("服务期数值")
     private Long serviceTimeNum;
+
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
 }