Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into future-9.9

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/OperationSettingApiService.java

@@ -20,8 +20,8 @@ public interface OperationSettingApiService {
     /**
      * 根据企业微信id查询
      *
-     * @param wxEnterpriseId
-     * @return
+     * @param wxEnterpriseId 企业微信id
+     * @return dto
      */
     OperationSettingDTO getByWxEnterpriseId(String wxEnterpriseId);
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SettingController.java

@@ -26,8 +26,8 @@ public class SettingController extends WebBaseController {
     @Autowired
     private OperationSettingApiService operationSettingApiService;
 
-    @RequestMapping(value = "/operation-setting/save-or-update", method = RequestMethod.POST)
-    private HaobanResponse operationSettingSaveOrUpdate(@RequestBody OperationSettingDTO dto) {
+    @RequestMapping("/operation-setting/save-or-update")
+    private HaobanResponse operationSettingSaveOrUpdate(OperationSettingDTO dto) {
         // 保存或更新操作设置
         if (Objects.isNull(dto)
                 || Objects.isNull(dto.getWxEnterpriseId())) {