Merge remote-tracking branch 'origin/work_group_update'

# Conflicts:
#	db/2022-1-4变更.sql
#	jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
This commit is contained in:
lijiarao
2022-05-12 09:56:43 +08:00
9 changed files with 468 additions and 15 deletions
@@ -87,6 +87,7 @@ public class PayCompanyManagement implements Serializable {
@ApiModelProperty(value = "银行账号")
@NotEmpty(message = "银行账号不能为空")
@Size(max = 50, message = "银行账号长度不能大于50个字符")
// @Pattern(regexp = "^[0-9]*$",message = "银行账号格式错误")
private String bankAccount;
/**企业角色1:普通企业、2:会员企业*/
@ApiModelProperty(value = "企业角色")