Browse Source

提交代码

ioioio 3 years ago
parent
commit
d03ee4ad34

+ 2 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Acc.java

@@ -302,4 +302,6 @@ public class Acc implements Serializable {
 	@TableField(exist = false)
 	private Integer flag;
 
+	private String chargeMember;
+
 }

+ 1 - 1
blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -126,7 +126,7 @@ public class CorpsDescController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入corpsDesc")
 	public R update(@Valid @RequestBody CorpsDesc corpsDesc) {
-		// 
+		//
 		if (corpsDesc.getId() == null) {
 			return R.data(500, "请选择要删除的数据", "error");
 		}

+ 2 - 1
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -75,7 +75,8 @@
     <select id="gainUser" resultType="map">
          SELECT
             id,
-            name
+            name,
+            real_name as realName
         FROM
             blade_user
         WHERE