Merge remote-tracking branch 'origin/master'

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPartHarmonicDetailMMapper.xml

@@ -111,8 +111,8 @@
         sum(is_i_48) i48OverDay,
         sum(is_i_49) i49OverDay,
         sum(is_i_50) i50OverDay,
-        sum(is_unbalance),
-        sum(is_i_neg)
+        sum(is_unbalance) unbalanceOverDay,
+        sum(is_i_neg) iNegOverDay
         from
         r_mp_part_harmonic_detail_d
         where

pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/UserParam.java

@@ -100,8 +100,7 @@ public class UserParam {
         private String loginName;
 
         @ApiModelProperty("用户表Id")
-        @NotBlank(message = UserValidMessage.ID_NOT_BLANK)
-        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        @NotNull(message = UserValidMessage.ID_NOT_BLANK)
         private String id;
     }