Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -62,8 +62,8 @@ public class SysUserAccountController extends BaseController {
     @PostMapping("/insert")
     @ApiOperation("提交")
     public HttpResult<Object> submit(@RequestBody SysUserAccountVo sysUserAccountVo) {
-        return HttpResult.ok("提现功能维护中");
-//        return sysUserAccountService.inert(sysUserAccountVo);
+//        return HttpResult.ok("提现功能维护中");
+        return sysUserAccountService.inert(sysUserAccountVo);
     }
 
     /**
@@ -75,8 +75,8 @@ public class SysUserAccountController extends BaseController {
     @PostMapping("/withdraw")
     @ApiOperation("提现")
     public HttpResult withdraw(@RequestBody SysUserAccountVo sysUserAccountVo) {
-        return HttpResult.ok("提现功能维护中");
-//        return sysUserAccountService.withdraw(sysUserAccountVo);
+//        return HttpResult.ok("提现功能维护中");
+        return sysUserAccountService.withdraw(sysUserAccountVo);
     }
 
     @GetMapping(value = "/getSysUserAmount")

src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -1175,7 +1175,7 @@
                   <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
                         AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                   </if>
-                UNION
+                UNION ALL
                 SELECT
                     a.third_detail_premiums AS "amount"
                 FROM
@@ -1196,7 +1196,7 @@
                 <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
                     AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                 </if>
-                UNION
+                UNION ALL
                 SELECT
                     a.second_detail_premiums AS "amount"
                 FROM