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

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004A.java

@@ -513,7 +513,6 @@ public class ServiceHGSC004A extends ServiceBase {
                     }
                     hgsc004AList.forEach(o->{
                         o.setProductStatus(HGConstant.ProductStatus.YTJ);
-                        o.setApprovalStatus(HGConstant.WlApprovalStatu.S_1);
                     });
                     DaoUtils.updateBatch(HGSC004A.UPDATE_PRODUCT_STATUS, hgsc004AList);
                 }

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004A.xml

@@ -438,7 +438,6 @@
 		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
 		UPDATED_NAME	= #updatedName#,   <!-- 更新人名称 -->
 		UPDATED_TIME	= #updatedTime#,   <!-- 更新时间 -->
-		approval_status	= #approvalStatus#,
 		PRODUCT_STATUS	= #productStatus#  <!-- 产品状态 0:未提交，1:已提交 -->
 		WHERE
 		ID = #id#