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

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -216,6 +216,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 					continue;
 				}
 				PointRuleEntity entity = ConvertUtils.sourceToTarget(defaultRule, PointRuleEntity.class);
+				entity.setId("");
 				entity.setCustomerId(customerDTO.getId());
 				insertList.add(entity);
 			}

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftCoverDao.xml

@@ -6,6 +6,7 @@
     <!-- 通过草稿Id获取草稿封面且创建时间是为最新的 -->
     <select id="selectByDraftId" resultType="com.epmet.entity.DraftCoverEntity">
         SELECT
+        cover.ID,
         cover.CUSTOMER_ID,
         cover.IMG_URL,
         cover.AUDIT_STATUS,