Merge branch 'dev_add_customer_id' into dev_temp

# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyImgDataEntity.java

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyImgDataEntity.java

@@ -36,4 +36,5 @@ public class ScreenDifficultyImgDataEntity extends BaseEpmetEntity {
      */
     @TableField(fill = FieldFill.INSERT)
     private String customerId;
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java

@@ -148,10 +148,12 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
                 dailyStatisticalToInsert.setIssueId(key);
                 dailyStatisticalToInsert.setStatisticalDate(yesterday);
                 dailyStatisticalToInsert.setCreatedBy(ModuleConstants.CREATED_OR_UPDATED_BY_SYSTEM);
+                dailyStatisticalToInsert.setCustomerId(value.get(NumConstant.ZERO).getCustomerId());
                 //此列无意义，统一存0
                 dailyStatisticalToInsert.setVotableCount(NumConstant.ZERO);
 
                 IssueVoteStatisticalDailyEntity dailyStatisticalToUpdate = new IssueVoteStatisticalDailyEntity();
+                dailyStatisticalToUpdate.setCustomerId(value.get(NumConstant.ZERO).getCustomerId());
                 dailyStatisticalToUpdate.setIssueId(key);
                 dailyStatisticalToUpdate.setStatisticalDate(yesterday);
                 dailyStatisticalToUpdate.setUpdatedBy(ModuleConstants.CREATED_OR_UPDATED_BY_SYSTEM);