Merge remote-tracking branch 'origin/master'

fs-user-app/src/main/java/com/fs/app/controller/store/CompanyUserScrmController.java

@@ -260,11 +260,14 @@ public class CompanyUserScrmController extends AppBaseController {
 
     @ApiOperation("获取公司收款码")
     @GetMapping("/getCompanyWxaCodeByPayment")
-    public R getCompanyWxaCodeByPayment(@RequestParam("companyId")Long companyId,@RequestParam(value = "appId", required = false) String appId, @RequestParam(required = false) Long companyUserId, HttpServletRequest request){
+    public R getCompanyWxaCodeByPayment(@RequestParam("companyId")Long companyId,
+                                        @RequestParam(value = "appId", required = false) String appId,
+                                        @RequestParam(required = false) Long companyUserId,
+                                        HttpServletRequest request){
 
         String json = configService.selectConfigByKey("his.pay");
         PayConfigDTO payConfigDTO = JSONUtil.toBean(json, PayConfigDTO.class);
-        if (appId == null || appId.trim().isEmpty()) {
+        if (appId == null || appId.trim().isEmpty() ) {
             appId = payConfigDTO.getAppId();
         }
         //获取用户码