Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
huangzj
2023-07-28 09:56:08 +08:00
parent 4600884a28 762a0847eb
commit a14381bcc5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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