增加字段

yijia-admin/src/main/java/com/yijia/web/controller/system/SysDeptController.java

@@ -303,4 +303,18 @@ public class SysDeptController extends BaseController
     }
 
 
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateDeptInfo")
+    public AjaxResult updateDeptInfo(@RequestBody SysDept dept)
+    {
+        int i=0;
+        if(dept!=null && dept.getDeptId()!=null){
+            dept.setUpdateBy(SecurityUtils.getUsername());
+            i = deptService.updateDept(dept);
+        }else {
+            return  AjaxResult.error("站点id 不能为空");
+        }
+        return toAjax(i);
+    }
+
 }

yijia-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_debug?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: develop
                 password: 1234.Abcd
                 #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8

yijia-admin/src/main/resources/application.yml

@@ -10,15 +10,15 @@ yijia:
   demoEnabled: true
   # 文件路径
   #正式服务器
-  profile: /home/uploadfile/images
-  imageurl: http://image.huijy.net:8088/images
-  #测试服务器
   #profile: /home/uploadfile/images
-  #imageurl: http://upload.huijy.net:8088/images
+  #imageurl: http://image.huijy.net:8088/images
+  #测试服务器
+  profile: /home/uploadfile/images
+  imageurl: http://upload.huijy.net:8088/images
   #本地测试服务
-  #profile: E:/img
+  # profile: D:/img
   #图片地址
-  #imageUrl: http://localhost:8080/profile
+  ##imageUrl: http://localhost:8080/profile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码开关

yijia-admin/src/main/resources/logback.xml

@@ -2,8 +2,9 @@
 <configuration>
     <!-- 日志存放路径 -->
 <!--    <property name="log.path" value="/home/testDemo/logs" />-->
-<!--    <property name="log.path" value="/home/devnote/deBugJar/logs" />-->
-    <property name="log.path" value="/home/prodJar/logs" />
+    <property name="log.path" value="/home/devnote/deBugJar/logs" />
+<!--    <property name="log.path" value="/home/devnote/demoJar/logs" />-->
+<!--    <property name="log.path" value="/home/prodJar/logs" />-->
 
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />

yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java

@@ -90,6 +90,15 @@ public class SysDept extends BaseEntity
     private String printDeviceType;
     private String isLngFlag;
     private String city;
+    private String couponEnabledFlag;
+
+    public String getCouponEnabledFlag() {
+        return couponEnabledFlag;
+    }
+
+    public void setCouponEnabledFlag(String couponEnabledFlag) {
+        this.couponEnabledFlag = couponEnabledFlag;
+    }
 
     public String getCity() {
         return city;