Merge branch 'dev-caomeihuizhang' into container-test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamCaomeiBadgeController.java

@@ -32,8 +32,8 @@ public class AdamCaomeiBadgeController extends BaseController {
 
     private final String prefix = "zhengzai/adam/caomei/badge";
 
-    private static final int BADGE_NAME_MAX_CHARS = 20;
-    private static final int BADGE_SUBTITLE_MAX_CHARS = 10;
+    private static final int BADGE_NAME_MAX_CHARS = 50;
+    private static final int BADGE_SUBTITLE_MAX_CHARS = 20;
 
     @Autowired
     private IAdamCaomeiBadgeAdminService adamCaomeiBadgeAdminService;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_add.html

@@ -10,13 +10,13 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">徽章名称：</label>
             <div class="col-sm-8">
-                <input name="name" class="form-control" type="text" maxlength="20" required placeholder="最多20个字">
+                <input name="name" class="form-control" type="text" maxlength="50" required placeholder="最多50个字">
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">徽章副标题：</label>
             <div class="col-sm-8">
-                <input name="subTitle" class="form-control" type="text" maxlength="10" placeholder="最多10个字">
+                <input name="subTitle" class="form-control" type="text" maxlength="20" placeholder="最多20个字">
             </div>
         </div>
         <div class="form-group">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_edit.html

@@ -11,13 +11,13 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">徽章名称：</label>
             <div class="col-sm-8">
-                <input name="name" th:field="*{name}" class="form-control" type="text" maxlength="20" required placeholder="最多20个字">
+                <input name="name" th:field="*{name}" class="form-control" type="text" maxlength="50" required placeholder="最多50个字">
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">徽章副标题：</label>
             <div class="col-sm-8">
-                <input name="subTitle" th:field="*{subTitle}" class="form-control" type="text" maxlength="10" placeholder="最多10个字">
+                <input name="subTitle" th:field="*{subTitle}" class="form-control" type="text" maxlength="20" placeholder="最多20个字">
             </div>
         </div>
         <div class="form-group">