Merge branch 'main' of http://172.14.1.63:3000/nextosd/ds-yamoto-farm-server

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/entity/BssAskHistory.java

@@ -34,6 +34,11 @@ public class BssAskHistory extends BaseEntity {
     private String status;
 
     /**
+     * ステータス
+     */
+    private String status;
+
+    /**
      * カテゴリ（大）
      */
     private String category1;

farm-crm/pom.xml

@@ -42,6 +42,11 @@
             <groupId>jp.yamoto</groupId>
             <artifactId>farm-crm-biz</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>jp.yamoto</groupId>
+            <artifactId>farm-quartz</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

farm-crm/src/main/resources/i18n/messages.properties

@@ -112,8 +112,8 @@ label.listDisplayItem=\u4E00\u89A7\u8868\u793A\u9805\u76EE
 label.mailAddress=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9
 label.roleName=\u30ED\u30FC\u30EB\u540D
 label.remark=\u5099\u8003
-label.userName=\u30A2\u30AB\u30A6\u30F3\u30C8
-label.nickName=\u30E6\u30FC\u30B6\u30FC\u540D\u79F0
+label.userName=\u30E6\u30FC\u30B6\u30FCID
+label.nickName=\u30E6\u30FC\u30B6\u30FC\u540D
 label.password=\u30D1\u30B9\u30EF\u30FC\u30C9
 label.role=\u30ED\u30FC\u30EB
 label.attachInfoConnect=\u7D10\u4ED8\u3051